make the symlink. Does not work for srcdir != buildir != . Beats me why; I

1999-11-22  Jonathan Blandford  <jrb@redhat.com>

	* configure.in (GDK_PIXBUF_DIR): make the symlink.  Does not work
	for srcdir != buildir != .  Beats me why; I can't figure it out.
	AC_OUTPUT_COMMANDS doesn't seem to let me substitute it correctly.

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index 0521ad91ec96f7a31be0a9c5bb51f74ee085b338..fa87674f042693a7978b5e536f759f0d82a18e5b 100644 (file)
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-drawable.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
 
 void close_app(GtkWidget *widget, gpointer data)
 {

diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index 63483f8291446904089468d0f4311a95063d251b..5d36b7a0b852a7079ebcfa6fb13b9b29fe3059e1 100644 (file)
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
-#include "gdk-pixbuf-loader.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf-loader.h"
 
 typedef struct {
        FILE             *imagefile;

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 2bbf215361affb4182d9f902ad27f309079bd8e1..9b3e516756c85a2ea71f2a3b2a24ecb3313ac53c 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-22  Jonathan Blandford  <jrb@redhat.com>
+
+       * configure.in (GDK_PIXBUF_DIR): make the symlink.  Does not work
+       for srcdir != buildir != .  Beats me why; I can't figure it out.
+       AC_OUTPUT_COMMANDS doesn't seem to let me substitute it correctly.
+
 1999-11-21  Jonathan Blandford  <jrb@redhat.com>
 
        * src/gdk-pixbuf-io.c: added io-bmp from Arjan

diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 4c3bd361062d6cd2aa612cf0c46abbc4c318b261..26c1cff9f609d35047f1ba11481588874d60748c 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 \f
 

diff --git a/gdk-pixbuf/gdk-pixbuf-drawable.h b/gdk-pixbuf/gdk-pixbuf-drawable.h
index 447c027bbc071eef9dc33054a54090fca72537f4..f312b03c6aac7c1795f7920dc8d97f064c7cb1c5 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-drawable.h
+++ b/gdk-pixbuf/gdk-pixbuf-drawable.h
@@ -2,7 +2,7 @@
 #define _GDK_PIXBUF_DRAWABLE_H_
 
 #include <gdk/gdk.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 GdkPixbuf *gdk_pixbuf_rgb_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
 GdkPixbuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index f884f484fb6c5f625a73abb901fd1aae42cd88b9..c09d51a6853d087666988ab3d046b181334e0960 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -23,7 +23,8 @@
 
 #include <config.h>
 #include <string.h>
-#include "gdk-pixbuf-io.h"
+#include <glib.h>
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 \f
 

diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index ba42c95ceb342574a8fef30b26f6c0e626b4227b..6cd889e7648b527c555d23a3cc17b4c5ae9b034c 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -28,8 +28,8 @@
 #define GDK_PIXBUF_IO_H
 
 #include <gmodule.h>
-#include "gdk-pixbuf.h"
 #include <stdio.h>
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index 346074f367dec7059fa4d935278b1e37b4e630d2..fc38ce2b28062929f667b72104b38d9b9bb4a5e8 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -25,8 +25,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gdk-pixbuf-loader.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf-loader.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <gtk/gtksignal.h>
 
 \f

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h
index 58fab340f25d2b2ee1bc4c629bb186ae98894240..1e67a17fd5384ecef3a8fb0344499bc946f43e60 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <gtk/gtkobject.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 6c9b2730eb6bfe8b9d14a5d380f6619458e896a2..83bd0d30e4bc3643f515d0fd6e4d20f6fcca5160 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -29,7 +29,7 @@
 #include <libart_lgpl/art_pixbuf.h>
 #include <libart_lgpl/art_rgb_pixbuf_affine.h>
 #include <libart_lgpl/art_alphagamma.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 \f
 

diff --git a/gdk-pixbuf/gnome-canvas-pixbuf.c b/gdk-pixbuf/gnome-canvas-pixbuf.c
index 1504e96c4e708cecd5c223b880a8e4f8e3131eb3..b928e430c7b02fae10d26ef508848f620fff9bee 100644 (file)
--- a/gdk-pixbuf/gnome-canvas-pixbuf.c
+++ b/gdk-pixbuf/gnome-canvas-pixbuf.c
@@ -24,8 +24,8 @@
 #include <math.h>
 #include <libgnomeui/gnome-canvas.h>
 #include <libgnomeui/gnome-canvas-util.h>
-#include "gdk-pixbuf.h"
-#include "gnome-canvas-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gnome-canvas-pixbuf.h"
 #include "libart_lgpl/art_rgb_pixbuf_affine.h"
 
 \f

diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 780a43324a02f72851ec509fe2c987decf52ba54..d40ce7820b2adbb4b308bb386912c287bd724626 100644 (file)
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -38,8 +38,8 @@ Known bugs:
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 \f
 
 

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 005bb907f0859e494a9af3ed245397a971b647b4..ed194b8813a91cca7f18f17e2fdffc82612626c1 100644 (file)
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -62,8 +62,8 @@
 #include <stdio.h>
 #include <glib.h>
 #include <string.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 \f
 

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 68660d4c74f9ac9ff8040fbaee1c9b328574ed68..8ec726f0c17c2ea08949abbf10c175fa62f4aed2 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -47,8 +47,8 @@
 #include <string.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 \f
 

diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 643b16c4087387b485c82b23f2081fade0999458..d650df3181f66e66e3d8ebe7bb0b2beb4dc4e962 100644 (file)
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include <stdio.h>
 #include <png.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 \f
 

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index a987106ed5d3b6b45b8d39989953e93eb44229f1..10681aaebdc1b639e2350816afed04411892ee21 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 \f
 

diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
index 7f44b2820cbc67dd0e1dd15995d1d35da67b6928..47726b81bddc52a3b11f7e186f43e2174646e29e 100644 (file)
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -37,8 +37,8 @@ Known bugs:
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 \f
 
 

diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 0a86c87f5ff91e78f5009b974cf1b1256c2ded37..c61494be23aef142cd13a3bf6f2dfc8e51a169e9 100644 (file)
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <tiffio.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <unistd.h>
 
 \f

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index b2f0715c62d9fe4c989033c3fe3b605a6188fc69..97229e60aab2a8aff3b43190b52a0eec25d9661d 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gdk/gdk.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 \f
 

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index b2af116aef669ffbdee810385ce43731e63aa191..f635af5d26020c7f5cf677b68cd2e7b884adcf9e 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -14,8 +14,8 @@
 #include <string.h>
 #include <glib.h>
 #include <gmodule.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-drawable.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
 
 
 #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)

diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index f708a107bb3740d9b165a09f1618c754fae711a1..0cc62a4bc22eb0dd478befbee746c38928aea3aa 100644 (file)
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <gdk/gdk.h>
 #include <libart_lgpl/art_rect.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 \f
 

diff --git a/gtk/gdk-pixbuf-loader.c b/gtk/gdk-pixbuf-loader.c
index 346074f367dec7059fa4d935278b1e37b4e630d2..fc38ce2b28062929f667b72104b38d9b9bb4a5e8 100644 (file)
--- a/gtk/gdk-pixbuf-loader.c
+++ b/gtk/gdk-pixbuf-loader.c
@@ -25,8 +25,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gdk-pixbuf-loader.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf-loader.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <gtk/gtksignal.h>
 
 \f

diff --git a/gtk/gdk-pixbuf-loader.h b/gtk/gdk-pixbuf-loader.h
index 58fab340f25d2b2ee1bc4c629bb186ae98894240..1e67a17fd5384ecef3a8fb0344499bc946f43e60 100644 (file)
--- a/gtk/gdk-pixbuf-loader.h
+++ b/gtk/gdk-pixbuf-loader.h
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <gtk/gtkobject.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {